Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Convert Harpy Singing Into a Trait #714

Conversation

Mnemotechnician
Copy link
Contributor

@Mnemotechnician Mnemotechnician commented Aug 10, 2024

Description

Adds a new trait that lets characters play midi without needing an instrument.

Singer a 1-point positive trait. For now it's only available for vulps and felinids as they are naturally more vocal than other species.

Also refactored harpy singing system a bit.

TODO

  • Find out whatever causes this. Not critical, but probably should be fixed...

image

Media

Outdated

image

image

Changelog

🆑

  • add: Added a new positive trait - singer. It allows you to play midi songs without an instrument, similarly to harpies.

@github-actions github-actions bot added Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: YML Changes any yml files labels Aug 10, 2024
@SimpleStation14 SimpleStation14 changed the title convert harpy singing into a trait Convert Harpy Singing Into a Trait Aug 10, 2024
@VMSolidus VMSolidus closed this Aug 10, 2024
@DangerRevolution DangerRevolution added Size: 3-Medium For medium issues/PRs Priority: 3-Medium Needs to be resolved at some point Status: Needs Discussion Must be discussed Type: Feature Creation of or significant changes to a feature labels Aug 10, 2024
@github-actions github-actions bot added the Status: Needs Review Someone please review this label Aug 10, 2024
@DangerRevolution
Copy link
Contributor

DangerRevolution commented Aug 10, 2024

remove it from the trait menu pending discussion;

if this is to make it into a generic trait; it would need to be limited in instrument choice entirely.

Generic Trait = Only whatever instrument the Microphone is
Harpy = All instruments

@Mnemotechnician
Copy link
Contributor Author

remove it from the trait menu

why so?

@DangerRevolution
Copy link
Contributor

DangerRevolution commented Aug 10, 2024

remove it from the trait menu

why so?

i updated the comment, should make more sense

@Mnemotechnician
Copy link
Contributor Author

Generic Trait = Only whatever instrument the Microphone is Harpy = All instruments

It only gives microphone and some second instrument I forgot

Copy link
Contributor

@DangerRevolution DangerRevolution left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Making the component generic is good; I have no idea how MIDI works but there should be some way to assign instruments per component. Ideally, the singer system is just the microphone instrument and then you can reuse it and add more instruments for Harpy

@Mnemotechnician
Copy link
Contributor Author

Making the component generic is good; I have no idea how MIDI works but there should be some way to assign instruments per component. Ideally, the singer system is just the microphone instrument and then you can reuse it and add more instruments for Harpy

image

@DangerRevolution
Copy link
Contributor

Making the component generic is good; I have no idea how MIDI works but there should be some way to assign instruments per component. Ideally, the singer system is just the microphone instrument and then you can reuse it and add more instruments for Harpy

image

:O

Co-authored-by: Danger Revolution! <[email protected]>
Signed-off-by: Mnemotechnican <[email protected]>
Copy link
Contributor

@DangerRevolution DangerRevolution left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cost higher, remove species requirement

Resources/Prototypes/Traits/skills.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Traits/skills.yml Show resolved Hide resolved
Resources/Prototypes/Traits/skills.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Traits/skills.yml Outdated Show resolved Hide resolved
Meh

Co-authored-by: VMSolidus <[email protected]>
Signed-off-by: Mnemotechnican <[email protected]>
@Mnemotechnician
Copy link
Contributor Author

Fuck, uh... Turns out prototypedata class is apart of robust toolbox, I edited it locally, but the change wasn't committed... which is now a test fail.

I need to find a way to fix that...

@Mnemotechnician
Copy link
Contributor Author

Mnemotechnician commented Aug 10, 2024

This works fine now. Singing types are now defined separately from the trait and can be re-used later, which makes things like singing parrots as easy to implement as adding type: Singer, proto: NormalSinging to them.

Also, the cost has been reduced to 1.

@DangerRevolution
Copy link
Contributor

test fail valid

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Aug 10, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Aug 11, 2024
@DangerRevolution
Copy link
Contributor

test fail still valid

@Mnemotechnician
Copy link
Contributor Author

I'll look into it, but later

@Mnemotechnician
Copy link
Contributor Author

It was a single-line fix :trollface:

@DangerRevolution DangerRevolution merged commit 441dee2 into Simple-Station:master Aug 15, 2024
13 checks passed
SimpleStation14 added a commit that referenced this pull request Aug 15, 2024
@gluesniffler gluesniffler mentioned this pull request Aug 21, 2024
13 tasks
tmcqueen pushed a commit to tmcqueen/Syndicate-Station that referenced this pull request Aug 24, 2024
# Description
Adds a new trait that lets characters play midi without needing an
instrument.

Singer a 1-point positive trait. For now it's only available for vulps
and felinids as they are naturally more vocal than other species.

Also refactored harpy singing system a bit.

# TODO

- [X] Find out whatever causes this. Not critical, but probably should
be fixed...
<details><p>


![image](https://github.com/user-attachments/assets/8e0a6bf5-5fa3-4a0a-8937-2931dfe4ee62)

</p></details>

<details><summary><h1>Media</h1></summary>
<p>

Outdated


![image](https://github.com/user-attachments/assets/018b6cf3-d510-46e2-8c38-4bd49e1929bd)


![image](https://github.com/user-attachments/assets/f27bd451-b3c2-4a22-ab50-35c2f4ecbcb3)

</p>
</details>

# Changelog
:cl:
- add: Added a new positive trait - singer. It allows you to play midi
songs without an instrument, similarly to harpies.

---------

Signed-off-by: Mnemotechnican <[email protected]>
Co-authored-by: Danger Revolution! <[email protected]>
Co-authored-by: VMSolidus <[email protected]>
tmcqueen pushed a commit to tmcqueen/Syndicate-Station that referenced this pull request Aug 24, 2024
tmcqueen pushed a commit to tmcqueen/Syndicate-Station that referenced this pull request Aug 24, 2024
# Description
Adds a new trait that lets characters play midi without needing an
instrument.

Singer a 1-point positive trait. For now it's only available for vulps
and felinids as they are naturally more vocal than other species.

Also refactored harpy singing system a bit.

# TODO

- [X] Find out whatever causes this. Not critical, but probably should
be fixed...
<details><p>


![image](https://github.com/user-attachments/assets/8e0a6bf5-5fa3-4a0a-8937-2931dfe4ee62)

</p></details>

<details><summary><h1>Media</h1></summary>
<p>

Outdated


![image](https://github.com/user-attachments/assets/018b6cf3-d510-46e2-8c38-4bd49e1929bd)


![image](https://github.com/user-attachments/assets/f27bd451-b3c2-4a22-ab50-35c2f4ecbcb3)

</p>
</details>

# Changelog
:cl:
- add: Added a new positive trait - singer. It allows you to play midi
songs without an instrument, similarly to harpies.

---------

Signed-off-by: Mnemotechnican <[email protected]>
Co-authored-by: Danger Revolution! <[email protected]>
Co-authored-by: VMSolidus <[email protected]>
tmcqueen pushed a commit to tmcqueen/Syndicate-Station that referenced this pull request Aug 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: YML Changes any yml files Priority: 3-Medium Needs to be resolved at some point Size: 3-Medium For medium issues/PRs Status: Needs Discussion Must be discussed Status: Needs Review Someone please review this Type: Feature Creation of or significant changes to a feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants